use gtk_menu_attach_to_widget() and gtk_menu_detach() instead of

2006-01-04  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkmenutoolbutton.c
	(gtk_menu_tool_button_set_menu)
	(gtk_menu_tool_button_destroy): use gtk_menu_attach_to_widget()
	and gtk_menu_detach() instead of reffing/unreffing the menu
	manually. Also fixes brokenness on screen change (bug #85715).

diff --git a/ChangeLog b/ChangeLog
index 488d38a962ebfede822b54cb90ea6f807b494b89..91dcf4dc40e32d4f697bde872cb649486a665a86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-04  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkmenutoolbutton.c
+       (gtk_menu_tool_button_set_menu)
+       (gtk_menu_tool_button_destroy): use gtk_menu_attach_to_widget()
+       and gtk_menu_detach() instead of reffing/unreffing the menu
+       manually. Also fixes brokenness on screen change (bug #85715).
+
 2006-01-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkaccelmap.c: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 488d38a962ebfede822b54cb90ea6f807b494b89..91dcf4dc40e32d4f697bde872cb649486a665a86 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-01-04  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkmenutoolbutton.c
+       (gtk_menu_tool_button_set_menu)
+       (gtk_menu_tool_button_destroy): use gtk_menu_attach_to_widget()
+       and gtk_menu_detach() instead of reffing/unreffing the menu
+       manually. Also fixes brokenness on screen change (bug #85715).
+
 2006-01-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkaccelmap.c: 

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index cefa6d323df8f7375b9232d277d48b8bf9c83fb7..e0d845d8a237f3d3baa2b320a1dd531cceaca046 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -450,8 +450,7 @@ gtk_menu_tool_button_destroy (GtkObject *object)
       g_signal_handlers_disconnect_by_func (button->priv->menu, 
                                            menu_deactivate_cb, 
                                            button);
-      g_object_unref (button->priv->menu);
-      button->priv->menu = NULL;
+      gtk_menu_detach (button->priv->menu);
 
       g_signal_handlers_disconnect_by_func (button->priv->arrow_button,
                                            arrow_button_toggled_cb, 
@@ -535,6 +534,17 @@ menu_deactivate_cb (GtkMenuShell      *menu_shell,
   return TRUE;
 }
 
+static void
+menu_detacher (GtkWidget *widget,
+               GtkMenu   *menu)
+{
+  GtkMenuToolButtonPrivate *priv = GTK_MENU_TOOL_BUTTON (widget)->priv;
+
+  g_return_if_fail (priv->menu == menu);
+
+  priv->menu = NULL;
+}
+
 /**
  * gtk_menu_tool_button_set_menu:
  * @button: a #GtkMenuToolButton
@@ -566,18 +576,19 @@ gtk_menu_tool_button_set_menu (GtkMenuToolButton *button,
           g_signal_handlers_disconnect_by_func (priv->menu, 
                                                menu_deactivate_cb, 
                                                button);
-         g_object_unref (priv->menu);
+         gtk_menu_detach (priv->menu);
        }
 
       priv->menu = GTK_MENU (menu);
 
       if (priv->menu)
         {
-          g_object_ref_sink (priv->menu);
+          gtk_menu_attach_to_widget (priv->menu, GTK_WIDGET (button),
+                                     menu_detacher);
 
           gtk_widget_set_sensitive (priv->arrow_button, TRUE);
 
-          g_signal_connect (button->priv->menu, "deactivate",
+          g_signal_connect (priv->menu, "deactivate",
                             G_CALLBACK (menu_deactivate_cb), button);
         }
       else